From 5698ad2c5bb5446df92f19600749df279fcbf6b1 Mon Sep 17 00:00:00 2001
From: Keir Fraser <keir@xensource.com>
Date: Thu, 11 Oct 2007 10:02:07 +0100
Subject: [PATCH] Do not include compile.h directly -- use version.h
 indirection functions. Signed-off-by: Keir Fraser <keir@xensource.com>

---
 xen/arch/x86/hvm/save.c  | 8 +++-----
 xen/drivers/video/vesa.c | 1 -
 xen/drivers/video/vga.c  | 1 -
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/xen/arch/x86/hvm/save.c b/xen/arch/x86/hvm/save.c
index e895df690f..d42c456c08 100644
--- a/xen/arch/x86/hvm/save.c
+++ b/xen/arch/x86/hvm/save.c
@@ -19,17 +19,15 @@
  */
 
 #include <xen/config.h>
-#include <xen/compile.h>
 #include <xen/lib.h>
+#include <xen/version.h>
 #include <public/version.h>
 #include <xen/sched.h>
-
 #include <asm/hvm/hvm.h>
 #include <asm/hvm/support.h>
 #include <asm/hvm/domain.h>
 #include <asm/current.h>
 
-
 /* List of handlers for various HVM save and restore types */
 static struct { 
     hvm_save_handler save;
@@ -94,7 +92,7 @@ int hvm_save(struct domain *d, hvm_domain_context_t *h)
     hdr.cpuid = eax;
 
     /* Save xen changeset */
-    c = strrchr(XEN_CHANGESET, ':');
+    c = strrchr(xen_changeset(), ':');
     if ( c )
         hdr.changeset = simple_strtoll(c, NULL, 16);
     else 
@@ -170,7 +168,7 @@ int hvm_load(struct domain *d, hvm_domain_context_t *h)
                "does not match host (%#"PRIx32").\n", hdr.cpuid, eax);
 
 
-    c = strrchr(XEN_CHANGESET, ':');
+    c = strrchr(xen_changeset(), ':');
     if ( hdr.changeset == -1ULL )
         gdprintk(XENLOG_WARNING, 
                  "HVM restore: Xen changeset was not saved.\n");
diff --git a/xen/drivers/video/vesa.c b/xen/drivers/video/vesa.c
index d12aa0361a..8f5b5c690b 100644
--- a/xen/drivers/video/vesa.c
+++ b/xen/drivers/video/vesa.c
@@ -5,7 +5,6 @@
  */
 
 #include <xen/config.h>
-#include <xen/compile.h>
 #include <xen/init.h>
 #include <xen/lib.h>
 #include <xen/mm.h>
diff --git a/xen/drivers/video/vga.c b/xen/drivers/video/vga.c
index 44b7092091..ef21178a01 100644
--- a/xen/drivers/video/vga.c
+++ b/xen/drivers/video/vga.c
@@ -5,7 +5,6 @@
  */
 
 #include <xen/config.h>
-#include <xen/compile.h>
 #include <xen/init.h>
 #include <xen/lib.h>
 #include <xen/mm.h>
-- 
2.30.2